merge
authorIan Campbell <ijc@hellion.org.uk>
Fri, 4 Jan 2013 15:58:37 +0000 (15:58 +0000)
committerIan Campbell <ijc@hellion.org.uk>
Fri, 4 Jan 2013 15:58:37 +0000 (15:58 +0000)

Trivial merge